* image.c (jpeg_memory_src): Don't assume string len fits in unsigned.

diff --git a/src/ChangeLog b/src/ChangeLog
index a005b1d80c78c39ed7ce0843e2d819a8d29126ee..92394c678eac021a4b119d76eeb840e30818ca82 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * image.c (jpeg_memory_src): Don't assume string len fits in unsigned.
+
 2012-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * eval.c: Add `inhibit-debugger'.

diff --git a/src/image.c b/src/image.c
index 52598a41ab9cfd997abe397bc601809e36ba6484..cf01602050faf6ad03c809027e277f72b8dd4068 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -6181,7 +6181,7 @@ our_memory_skip_input_data (j_decompress_ptr cinfo, long int num_bytes)
    reading the image.  */
 
 static void
-jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, unsigned int len)
+jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, ptrdiff_t len)
 {
   struct jpeg_source_mgr *src;